(popup-dialog-box): Bind meaning with let.

(current-menubar): Add defvar.

diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el
index a8fa759d4d2112035a0b37dd9a7fc88247d38565..80fb1e084c6a18122f465bfd20db3c69fdcd8c21 100644 (file)
--- a/lisp/emacs-lisp/lmenu.el
+++ b/lisp/emacs-lisp/lmenu.el
@@ -27,6 +27,8 @@
 
 ;; Arrange to use current-menubar to set up part of the menu bar.
 
+(defvar current-menubar)
+
 (setq recompute-lucid-menubar 'recompute-lucid-menubar)
 (defun recompute-lucid-menubar ()
   (define-key lucid-menubar-map [menu-bar]
@@ -179,7 +181,7 @@ The syntax, more precisely:
   (let ((name (car data))
        (tail (cdr data))
        converted
-       choice)
+       choice meaning)
     (while tail
       (if (null (car tail))
          (setq converted (cons nil converted))